Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 7 Apr 2012 15:09:27 +0000 (08:09 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 7 Apr 2012 15:09:27 +0000 (08:09 -0700)

Trivial merge